Remove name conflict