Tweaked names of event handling functions.