The location and name of some functions changed.