Use custom link names to get hosts without underscores (bug 1059718)