Rename a function, rearrange header contents.