Merge "Avoid man-in-the-middle terminology"