fix event names

Be consistent across files, and different event for differents actions.