Rename some function parameters