Constants in Events looks good now
Merge pull request #2979 from Undev/fix_naming

Constants in Events looks good now