Normalize remote end points