Rename recipientId property to endpointId to better reflect purpose.