Correct names of funcs