Fixed naming issues in event handlers.