fixing bug, separate gen_file from name_source behavior