Merge "Fix non camelCase function names"