Update and rename Client to payment_client