Small changes to several function names.