Renaming some functions (see CHANGELOG).