Change function and variable names