Rename ActionPaymentAware to PaymentAwareAction