Refactor recipient->receiver