REFACTOR: Renamed fields