fix name overlap