Renamed fields + fixed references