Fix sender/receiver fields - swap their names