[WIP] rename events

That's just the renaming part for the events, but is that enough?
Made a suggestion in #569