Rename some functions as snake case