Change function name; fix