Also change "Payment gateway service name" to "Payment service".