consistent renaming of functions