Change events name to adapt to client