[overlapping-features] More work

- Update specs to correspond with new naming convention for spans
- Editing features seem to be working again