fix name conflict bug