Cleanup remaining events names [#20]