Renaming recipient and sender. Issue #3