Merge "Fix function name case"