Some functions renaming