update for name conflict