Changed some field names