Changed method names and variable names