Rename 'other' and 'otherUser' to 'peer' to describe better and consistently the intention