Fix the name_list improvements.