Fixed event names to follow spec