Fix multiple name issue