Fix function/variable names.