Renamed more fields within the code