Rename payment gateway events
Merge branch 'hotfix/0.1.9'