Changed some event names