a quick change in the names of some functions