Add botName to event and some cleanup.