Updated all events to new naming
Merge branch 'master' of https://github.com/matiboy/compargo