updates naming conventions, replaces peerId with callerId