Change hardcoded events names by its constant.
Merge pull request #5762 in master
Merge pull request #5714
Merge pull request #5714 in develop