fix function names