Renamed fields and methods to be more explanatory