fix name overlapping