Fix function and variable names