Rename event usage to type (ref #1289)