rename clean-up
update event name