Names of some functions changed.