Fixed the event transmission to have proper naming