Update simple Segment fields to remove duplicates

Remove simple Segment `id` field as it duplicates its parent Identified
`id` field.

Rename `type` field to `segmentType` to avoid duplicating Identifieds
`type` field
Merge branch 'segment-fields' into stage

* segment-fields:
  Update simple Segment fields to remove duplicates