Fix name issue