Adjust event names to the correct