Renamed final fields to comply with naming convention