Merge "Fix typo in socket name"