Changed event related function names