Fixed some unchanged field names