fixes to the event index naming