Fixing NameNormalizer.