Change function names for more readability