Rename some functions and constants