improve consistency of event naming