Rename the event handler.
Minimal fixes.