Make serializer field names and order closer to UI.