Fixed problems with duplicate names in same event