Renamed final fields according to naming conventions