- changed from 'type' to 'name' in Event