Refactored name of some functions