fix name convention of functions