More name normalisation