Rename some functions to make code less confusing.