Fix method and variable names