genxml: Rename fields to match gen6+.