Tweaks in PaymentApi (reordering of fields for consistency)