Rename the event stuff a bit