Rename funcs to use camel case.