Fix function names of ReturnValue