Functions renaming