Rename payment manager route properties
Merge branch 'hotfix/0.1.5'
Refactor payment manager
Merge branch 'hotfix/0.1.6'