Restructured to a central NameCorrector class.