[#901] Improve some helper function names