Changed field names according to the RFC