Rename some function expressions