fix a name conflict