name_mapping is also updated