Merge "Fixed some field names"