Rename billing_type to pay_type