Fixes to event naming