rename NameExpansionCore to NameExpansion