Some name changes in event related functions.