fix multiple-words names issue