Update namespaces to PaymentSuite