Renamed methods/variables to be more consistent across project