Field code should not change when name is edited.
Merge branch 'edit_swarm_fields'