diff --git a/lib/stripe/api_operations/search.rb b/lib/stripe/api_operations/search.rb
index ac9dc26b..655ad74e 100644
--- a/lib/stripe/api_operations/search.rb
+++ b/lib/stripe/api_operations/search.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# TODO: (major) Deprecated, Remove along with extends
 module Stripe
   module APIOperations
     module Search
diff --git a/lib/stripe/resources/charge.rb b/lib/stripe/resources/charge.rb
index 8a31e357..2832d3c2 100644
--- a/lib/stripe/resources/charge.rb
+++ b/lib/stripe/resources/charge.rb
@@ -43,7 +43,7 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/charges/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/charges/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/customer.rb b/lib/stripe/resources/customer.rb
index d92221e5..e9a737a3 100644
--- a/lib/stripe/resources/customer.rb
+++ b/lib/stripe/resources/customer.rb
@@ -114,7 +114,7 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/customers/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/customers/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/invoice.rb b/lib/stripe/resources/invoice.rb
index 965545ee..5789fe3f 100644
--- a/lib/stripe/resources/invoice.rb
+++ b/lib/stripe/resources/invoice.rb
@@ -167,7 +167,7 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/invoices/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/invoices/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/payment_intent.rb b/lib/stripe/resources/payment_intent.rb
index 3dd1a25f..932d6cab 100644
--- a/lib/stripe/resources/payment_intent.rb
+++ b/lib/stripe/resources/payment_intent.rb
@@ -248,7 +248,12 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/payment_intents/search", params, opts)
+      request_stripe_object(
+        method: :get,
+        path: "/v1/payment_intents/search",
+        params: params,
+        opts: opts
+      )
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/price.rb b/lib/stripe/resources/price.rb
index 414c9dc1..b141f09c 100644
--- a/lib/stripe/resources/price.rb
+++ b/lib/stripe/resources/price.rb
@@ -17,7 +17,7 @@ module Stripe
     OBJECT_NAME = "price"
 
     def self.search(params = {}, opts = {})
-      _search("/v1/prices/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/prices/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/product.rb b/lib/stripe/resources/product.rb
index 75f5804a..08097592 100644
--- a/lib/stripe/resources/product.rb
+++ b/lib/stripe/resources/product.rb
@@ -20,7 +20,7 @@ module Stripe
     OBJECT_NAME = "product"
 
     def self.search(params = {}, opts = {})
-      _search("/v1/products/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/products/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)
diff --git a/lib/stripe/resources/subscription.rb b/lib/stripe/resources/subscription.rb
index 487e599e..edb7c1fa 100644
--- a/lib/stripe/resources/subscription.rb
+++ b/lib/stripe/resources/subscription.rb
@@ -84,7 +84,12 @@ module Stripe
     save_nested_resource :source
 
     def self.search(params = {}, opts = {})
-      _search("/v1/subscriptions/search", params, opts)
+      request_stripe_object(
+        method: :get,
+        path: "/v1/subscriptions/search",
+        params: params,
+        opts: opts
+      )
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)