RENAME SOME FUNCTIONS