diff --git a/spec/resources/bank_account_holder_verification_spec.rb b/spec/resources/bank_account_holder_verification_spec.rb
index c6c1f27..a37fccb 100644
--- a/spec/resources/bank_account_holder_verification_spec.rb
+++ b/spec/resources/bank_account_holder_verification_spec.rb
@@ -121,7 +121,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/bank_account_holder_verifications/#{id}"
+        stub_url = '/bank_account_holder_verifications/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/bank_authorisation_spec.rb b/spec/resources/bank_authorisation_spec.rb
index 0498575..5de081b 100644
--- a/spec/resources/bank_authorisation_spec.rb
+++ b/spec/resources/bank_authorisation_spec.rb
@@ -141,7 +141,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/bank_authorisations/#{id}"
+        stub_url = '/bank_authorisations/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/billing_request_spec.rb b/spec/resources/billing_request_spec.rb
index fef97bc..5caf1c8 100644
--- a/spec/resources/billing_request_spec.rb
+++ b/spec/resources/billing_request_spec.rb
@@ -165,7 +165,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/billing_requests/#{id}"
+        stub_url = '/billing_requests/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/billing_request_template_spec.rb b/spec/resources/billing_request_template_spec.rb
index a7339c0..af0135c 100644
--- a/spec/resources/billing_request_template_spec.rb
+++ b/spec/resources/billing_request_template_spec.rb
@@ -444,7 +444,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/billing_request_templates/#{id}"
+        stub_url = '/billing_request_templates/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/block_spec.rb b/spec/resources/block_spec.rb
index a3a3940..1b49da7 100644
--- a/spec/resources/block_spec.rb
+++ b/spec/resources/block_spec.rb
@@ -133,7 +133,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/blocks/#{id}"
+        stub_url = '/blocks/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/creditor_bank_account_spec.rb b/spec/resources/creditor_bank_account_spec.rb
index 25c9773..9a71ba7 100644
--- a/spec/resources/creditor_bank_account_spec.rb
+++ b/spec/resources/creditor_bank_account_spec.rb
@@ -149,7 +149,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/creditor_bank_accounts/#{id}"
+        stub_url = '/creditor_bank_accounts/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/creditor_spec.rb b/spec/resources/creditor_spec.rb
index ee69ab2..c36cf46 100644
--- a/spec/resources/creditor_spec.rb
+++ b/spec/resources/creditor_spec.rb
@@ -185,7 +185,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/creditors/#{id}"
+        stub_url = '/creditors/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/customer_bank_account_spec.rb b/spec/resources/customer_bank_account_spec.rb
index ebbe78f..b2bfce1 100644
--- a/spec/resources/customer_bank_account_spec.rb
+++ b/spec/resources/customer_bank_account_spec.rb
@@ -157,7 +157,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/customer_bank_accounts/#{id}"
+        stub_url = '/customer_bank_accounts/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/customer_spec.rb b/spec/resources/customer_spec.rb
index 6f86622..cd6605b 100644
--- a/spec/resources/customer_spec.rb
+++ b/spec/resources/customer_spec.rb
@@ -173,7 +173,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/customers/#{id}"
+        stub_url = '/customers/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/instalment_schedule_spec.rb b/spec/resources/instalment_schedule_spec.rb
index 53b48b9..678c0bc 100644
--- a/spec/resources/instalment_schedule_spec.rb
+++ b/spec/resources/instalment_schedule_spec.rb
@@ -137,7 +137,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/instalment_schedules/#{id}"
+        stub_url = '/instalment_schedules/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
@@ -294,7 +294,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/instalment_schedules/#{id}"
+        stub_url = '/instalment_schedules/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/mandate_import_spec.rb b/spec/resources/mandate_import_spec.rb
index 93322b4..fda303c 100644
--- a/spec/resources/mandate_import_spec.rb
+++ b/spec/resources/mandate_import_spec.rb
@@ -121,7 +121,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/mandate_imports/#{id}"
+        stub_url = '/mandate_imports/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/mandate_spec.rb b/spec/resources/mandate_spec.rb
index 6dccdc6..f75faef 100644
--- a/spec/resources/mandate_spec.rb
+++ b/spec/resources/mandate_spec.rb
@@ -165,7 +165,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/mandates/#{id}"
+        stub_url = '/mandates/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/outbound_payment_import_spec.rb b/spec/resources/outbound_payment_import_spec.rb
index 8003a59..25752bd 100644
--- a/spec/resources/outbound_payment_import_spec.rb
+++ b/spec/resources/outbound_payment_import_spec.rb
@@ -133,7 +133,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/outbound_payment_imports/#{id}"
+        stub_url = '/outbound_payment_imports/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/outbound_payment_spec.rb b/spec/resources/outbound_payment_spec.rb
index bfeb239..2093d0e 100644
--- a/spec/resources/outbound_payment_spec.rb
+++ b/spec/resources/outbound_payment_spec.rb
@@ -153,7 +153,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/outbound_payments/#{id}"
+        stub_url = '/outbound_payments/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/payer_authorisation_spec.rb b/spec/resources/payer_authorisation_spec.rb
index d12f790..f14f91c 100644
--- a/spec/resources/payer_authorisation_spec.rb
+++ b/spec/resources/payer_authorisation_spec.rb
@@ -222,7 +222,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/payer_authorisations/#{id}"
+        stub_url = '/payer_authorisations/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/payment_spec.rb b/spec/resources/payment_spec.rb
index b1ef4c7..2147b93 100644
--- a/spec/resources/payment_spec.rb
+++ b/spec/resources/payment_spec.rb
@@ -165,7 +165,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/payments/#{id}"
+        stub_url = '/payments/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/redirect_flow_spec.rb b/spec/resources/redirect_flow_spec.rb
index 620653c..414f382 100644
--- a/spec/resources/redirect_flow_spec.rb
+++ b/spec/resources/redirect_flow_spec.rb
@@ -145,7 +145,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/redirect_flows/#{id}"
+        stub_url = '/redirect_flows/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/refund_spec.rb b/spec/resources/refund_spec.rb
index e4ce121..d28c96f 100644
--- a/spec/resources/refund_spec.rb
+++ b/spec/resources/refund_spec.rb
@@ -137,7 +137,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/refunds/#{id}"
+        stub_url = '/refunds/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/scheme_identifier_spec.rb b/spec/resources/scheme_identifier_spec.rb
index b26e763..8eb1ded 100644
--- a/spec/resources/scheme_identifier_spec.rb
+++ b/spec/resources/scheme_identifier_spec.rb
@@ -173,7 +173,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/scheme_identifiers/#{id}"
+        stub_url = '/scheme_identifiers/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/resources/subscription_spec.rb b/spec/resources/subscription_spec.rb
index afeca8d..04d1dd7 100644
--- a/spec/resources/subscription_spec.rb
+++ b/spec/resources/subscription_spec.rb
@@ -185,7 +185,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/subscriptions/#{id}"
+        stub_url = '/subscriptions/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/bank_account_holder_verifications_service_spec.rb b/spec/services/bank_account_holder_verifications_service_spec.rb
index c015e8e..8c06e37 100644
--- a/spec/services/bank_account_holder_verifications_service_spec.rb
+++ b/spec/services/bank_account_holder_verifications_service_spec.rb
@@ -144,7 +144,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/bank_account_holder_verifications/#{id}"
+        stub_url = '/bank_account_holder_verifications/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/bank_authorisations_service_spec.rb b/spec/services/bank_authorisations_service_spec.rb
index f80a3bb..35e3023 100644
--- a/spec/services/bank_authorisations_service_spec.rb
+++ b/spec/services/bank_authorisations_service_spec.rb
@@ -164,7 +164,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/bank_authorisations/#{id}"
+        stub_url = '/bank_authorisations/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/billing_request_templates_service_spec.rb b/spec/services/billing_request_templates_service_spec.rb
index 2947e8d..69913eb 100644
--- a/spec/services/billing_request_templates_service_spec.rb
+++ b/spec/services/billing_request_templates_service_spec.rb
@@ -698,7 +698,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/billing_request_templates/#{id}"
+        stub_url = '/billing_request_templates/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/billing_requests_service_spec.rb b/spec/services/billing_requests_service_spec.rb
index 49171df..be6504c 100644
--- a/spec/services/billing_requests_service_spec.rb
+++ b/spec/services/billing_requests_service_spec.rb
@@ -188,7 +188,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/billing_requests/#{id}"
+        stub_url = '/billing_requests/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/blocks_service_spec.rb b/spec/services/blocks_service_spec.rb
index 422e028..fc1547e 100644
--- a/spec/services/blocks_service_spec.rb
+++ b/spec/services/blocks_service_spec.rb
@@ -156,7 +156,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/blocks/#{id}"
+        stub_url = '/blocks/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/creditor_bank_accounts_service_spec.rb b/spec/services/creditor_bank_accounts_service_spec.rb
index 66ee6d6..8252b28 100644
--- a/spec/services/creditor_bank_accounts_service_spec.rb
+++ b/spec/services/creditor_bank_accounts_service_spec.rb
@@ -172,7 +172,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/creditor_bank_accounts/#{id}"
+        stub_url = '/creditor_bank_accounts/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/creditors_service_spec.rb b/spec/services/creditors_service_spec.rb
index 7a857a2..d93f34e 100644
--- a/spec/services/creditors_service_spec.rb
+++ b/spec/services/creditors_service_spec.rb
@@ -208,7 +208,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/creditors/#{id}"
+        stub_url = '/creditors/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/customer_bank_accounts_service_spec.rb b/spec/services/customer_bank_accounts_service_spec.rb
index 7bebd82..ab07362 100644
--- a/spec/services/customer_bank_accounts_service_spec.rb
+++ b/spec/services/customer_bank_accounts_service_spec.rb
@@ -180,7 +180,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/customer_bank_accounts/#{id}"
+        stub_url = '/customer_bank_accounts/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/customers_service_spec.rb b/spec/services/customers_service_spec.rb
index ab8f41f..c8c011d 100644
--- a/spec/services/customers_service_spec.rb
+++ b/spec/services/customers_service_spec.rb
@@ -196,7 +196,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/customers/#{id}"
+        stub_url = '/customers/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/instalment_schedules_service_spec.rb b/spec/services/instalment_schedules_service_spec.rb
index a0bad21..ad46964 100644
--- a/spec/services/instalment_schedules_service_spec.rb
+++ b/spec/services/instalment_schedules_service_spec.rb
@@ -160,7 +160,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/instalment_schedules/#{id}"
+        stub_url = '/instalment_schedules/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
@@ -356,7 +356,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/instalment_schedules/#{id}"
+        stub_url = '/instalment_schedules/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/mandate_imports_service_spec.rb b/spec/services/mandate_imports_service_spec.rb
index f8aff6e..fdd977c 100644
--- a/spec/services/mandate_imports_service_spec.rb
+++ b/spec/services/mandate_imports_service_spec.rb
@@ -144,7 +144,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/mandate_imports/#{id}"
+        stub_url = '/mandate_imports/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/mandates_service_spec.rb b/spec/services/mandates_service_spec.rb
index 7928f52..e8309cc 100644
--- a/spec/services/mandates_service_spec.rb
+++ b/spec/services/mandates_service_spec.rb
@@ -188,7 +188,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/mandates/#{id}"
+        stub_url = '/mandates/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/outbound_payment_imports_service_spec.rb b/spec/services/outbound_payment_imports_service_spec.rb
index 29a6df8..bc447e6 100644
--- a/spec/services/outbound_payment_imports_service_spec.rb
+++ b/spec/services/outbound_payment_imports_service_spec.rb
@@ -156,7 +156,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/outbound_payment_imports/#{id}"
+        stub_url = '/outbound_payment_imports/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/outbound_payments_service_spec.rb b/spec/services/outbound_payments_service_spec.rb
index d973293..0218b39 100644
--- a/spec/services/outbound_payments_service_spec.rb
+++ b/spec/services/outbound_payments_service_spec.rb
@@ -176,7 +176,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/outbound_payments/#{id}"
+        stub_url = '/outbound_payments/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/payer_authorisations_service_spec.rb b/spec/services/payer_authorisations_service_spec.rb
index 591b614..2876d83 100644
--- a/spec/services/payer_authorisations_service_spec.rb
+++ b/spec/services/payer_authorisations_service_spec.rb
@@ -300,7 +300,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/payer_authorisations/#{id}"
+        stub_url = '/payer_authorisations/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/payments_service_spec.rb b/spec/services/payments_service_spec.rb
index 44eb1ee..8d142a7 100644
--- a/spec/services/payments_service_spec.rb
+++ b/spec/services/payments_service_spec.rb
@@ -188,7 +188,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/payments/#{id}"
+        stub_url = '/payments/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/redirect_flows_service_spec.rb b/spec/services/redirect_flows_service_spec.rb
index 3ccf3d2..0c1b9bd 100644
--- a/spec/services/redirect_flows_service_spec.rb
+++ b/spec/services/redirect_flows_service_spec.rb
@@ -168,7 +168,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/redirect_flows/#{id}"
+        stub_url = '/redirect_flows/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/refunds_service_spec.rb b/spec/services/refunds_service_spec.rb
index 79d1161..eb28f86 100644
--- a/spec/services/refunds_service_spec.rb
+++ b/spec/services/refunds_service_spec.rb
@@ -160,7 +160,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/refunds/#{id}"
+        stub_url = '/refunds/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/scheme_identifiers_service_spec.rb b/spec/services/scheme_identifiers_service_spec.rb
index a085503..d57fdef 100644
--- a/spec/services/scheme_identifiers_service_spec.rb
+++ b/spec/services/scheme_identifiers_service_spec.rb
@@ -196,7 +196,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/scheme_identifiers/#{id}"
+        stub_url = '/scheme_identifiers/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {
diff --git a/spec/services/subscriptions_service_spec.rb b/spec/services/subscriptions_service_spec.rb
index 060f553..cae39af 100644
--- a/spec/services/subscriptions_service_spec.rb
+++ b/spec/services/subscriptions_service_spec.rb
@@ -208,7 +208,7 @@
       end
 
       let!(:get_stub) do
-        stub_url = "/subscriptions/#{id}"
+        stub_url = '/subscriptions/:identity'.gsub(':identity', id)
         stub_request(:get, /.*api.gocardless.com#{stub_url}/).
           to_return(
             body: {