Update field names and use correct unsigned types.