fixing name conflict