I hesitated to do that, but finaly didn't to avoid too many changes.
But this PR may be the opportunity to give some consistency in event names.