change names of events; fix _emit event removal