some function renaming