Clarify some function names