improved standardization of function names