When making M2M changes over multiple fields, field names are not assigned correctly

See failing test for details