[#1147] fixed imports from name_cleaver