Revert "Unify event names"

This reverts commit b6975a8161ad28cae41feb5e824cf2ca6d318e8c.