pop_names fix