Revert "Fixed event names"

This reverts commit 4043d28a315ebbf4ccb63c303d680ae9de24be06.