Use the unadulterated node name in server name

BugzID: 18215