added some name normalization