Refactor funtion names