Renamed fields in all classes to avoid naming hiding warnings.