updated comment, and rename NameExpansionCore to NameExpansion