Use more appropriate function names