fix function and variable name