Changed payment type values
street_address => billing_address