Added variant name, moved name normalisation out to service