fix name overlaping