Fix function names