Make the serverName generic again