tidy events. change names