Rename some functions and variables