Rename a few keyword arguments