Fixes to event naming

Hope I did all this correctly...