Rename more functions.