Reverse the event names to fit with the development branch