Minor tweaking to make event naming more consistent