Changed event names to fit convention