Changed some method and variable names.