Fix function name, argument name conflict