simplify, standardise function names