Rename some of the events.
Make that public so it is actually useable.