modify names and map