regularize function names