Renamed the events to reflect the config name style