Try to clean up event names some more.