fix name conflict for current